bitkeeper revision 1.1195 (420e5ff3SFUc-sHp8lfCe-xCoUlk-A)

Hand merge

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/shadow.c
index 0611c837972ba0e558c30f33bd72b0719756ff45,1131ab5e200930c5b5937f768b41ca011e0491f7..1fc3a254009fd260765e4f050c666ac8e8f9e63c
--- 1/xen/arch/x86/shadow.c
--- 2/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@@ -847,12 -848,34 +852,34 @@@ static int check_l1_table
  {
      int i;
      unsigned long *gpl1e, *spl1e;
+     int cpu = current->processor;
+     int errors = 0;
+ 
+     // First check to see if this guest page is currently the active
+     // PTWR page.  If so, then we compare the (old) cached copy of the
+     // guest page to the shadow, and not the currently writable (and
+     // thus potentially out-of-sync) guest page.
+     //
+     if ( VM_ASSIST(d, VMASST_TYPE_writable_pagetables) )
+     {
+         for ( i = 0; i < ARRAY_SIZE(ptwr_info->ptinfo); i++)
+         {
+             if ( ptwr_info[cpu].ptinfo[i].l1va &&
+                  ((v2m(ptwr_info[cpu].ptinfo[i].pl1e) >> PAGE_SHIFT) == gmfn) )
+             {
+                 unsigned long old = gmfn;
+                 gmfn = (v2m(ptwr_info[cpu].ptinfo[i].page) >> PAGE_SHIFT);
+                 printk("hit1 ptwr_info[%d].ptinfo[%d].l1va, mfn=0x%08x, snapshot=0x%08x\n",
+                        cpu, i, old, gmfn);
+             }
+         }
+     }
  
-     gpl1e = map_domain_mem(g2mfn << PAGE_SHIFT);
-     spl1e = map_domain_mem(s2mfn << PAGE_SHIFT);
+     gpl1e = map_domain_mem(gmfn << PAGE_SHIFT);
+     spl1e = map_domain_mem(smfn << PAGE_SHIFT);
  
 -    for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ )
 +    for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ )
-         check_pte(d, &gpl1e[i], &spl1e[i], 1, i);
+         errors += check_pte(d, &gpl1e[i], &spl1e[i], 1, l2_idx, i);
   
      unmap_domain_mem(spl1e);
      unmap_domain_mem(gpl1e);

diff --cc xen/common/keyhandler.c
Simple merge

diff --cc xen/drivers/char/console.c
Simple merge

diff --cc xen/include/asm-x86/config.h
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge

diff --cc xen/include/xen/perfc_defn.h
index ba369f3603df9fff3dd56429324802d32006518d,5f46322a436e414db5a444defd9e3cbada467e27..af13e7121183b9e2e7f75f03755c4dfd45997680
--- 1/xen/include/xen/perfc_defn.h
--- 2/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@@ -31,7 -32,5 +32,10 @@@ PERFCOUNTER_CPU( shadow_update_va_fail2
  PERFSTATUS( shadow_l2_pages, "current # shadow L2 pages" )
  PERFSTATUS( shadow_l1_pages, "current # shadow L1 pages" )
  
+ PERFCOUNTER_CPU( check_pagetable, "calls to check_pagetable" )
+ PERFCOUNTER_CPU( check_all_pagetables, "calls to check_all_pagetables" )
++
 +#define VMX_PERF_EXIT_REASON_SIZE 37
 +#define VMX_PERF_VECTOR_SIZE 0x20
 +PERFCOUNTER_ARRAY(vmexits, "vmexits", VMX_PERF_EXIT_REASON_SIZE )
 +PERFCOUNTER_ARRAY(cause_vector, "cause vector", VMX_PERF_VECTOR_SIZE )